recompiled after merging pull requests