Merge branch '2514' into merge_master