Merge branch '2781_cleanup' into 4.8.1-stable