Merge branch 'preload-changes' into 'develop'