Merge branch 'docs/ap_c2s' into 'develop'