Merge branch '2741_cleanup' into 4.8.1-stable