5.0.5 cleanup

Merging current state of cleanup branch into master