Merge branch 'develop' into multiple-users-pos-profile