Merge branch '2877_stable_cleanup' into 4.8.1-stable