re-did changes for AUTO-824 bug
Merge pull request #584 from MariaAbrahms/AUTO-824b

re-did changes for AUTO-824 bug