Merge pull request #360 from hflynn/9538-develop

9538 develop