AppCode:Build: merge conflicts
(cherry picked from commit e089686)