Merge branch '2518_cleanup' into 4.7.5-stable