Bug 914694 - followup to fix bugs on production
Merge pull request #1265 from silverorange/914694-followup

bug 914694. followup to fix bugs on production