Merge branch '2846_cleanup' into 4.8.1-stable