Merge branch 'rmehta-primary-action-fixes' into develop