Merge "Initial changes to restore clings." into jb-ub-now-indigo-rose