Merged master & incremented version