removed apc section because of unstability
Merge branch 'develop'