Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'