Merge branch 'topic/prebuild.sync.2015-05-20'