Merge branch 'chore/fix-ap-muted-tests' into 'develop'