Updates based on PM feedback.
#MBL-10328
Merge branch 'develop' of https://github.com/Saleslogix/argos-saleslogix into develop