Merge preparation for next development iteration