Sync with master repo and fix parts of baseline

Load still failing under travis though... while it works in local image :-(