branch 'develop' is compilable, merging