[1297] Fix merging problem. This is version if preferred and is same as stable.