Merge branch 'fix/users_ap_id_not_null' into 'develop'