Merge "Specify workspace resource in preload broadcast" into jb-mr1-dev