Merge master into skin-module - Resolve test failures.