Merge branch 'features/ap_id-c2s-authentication' into 'develop'