Merge FacadeGone changes