Merge to production request ticket #199 and #201