Merge "Change custom workspace cling" into jb-dev