Merge branch 'fix/ap-hide-follows' into 'develop'