am 7f47685e: Merge "Change custom workspace cling" into jb-dev

* commit '7f47685e662aa4ba17c58d903bc474a35a730444':
  Change custom workspace cling