Merge branch 'refactor/approval_pending_user_field' into 'develop'