Merge "Don't reinflate signal cluster after inflate" into oc-dev