Merge branch 'preloadfixups' into 'develop'