Removing APC
Merge branch 'develop'