Merge branch 'features/validators-apc2s' into 'develop'