Merge "Use different cling for custom workspace" into jb-dev