Merge pull request #2077 from AndrewPodner/develop

update for Issue #2064 - take 2