Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'