reuben commit fixed edit semantic of facade support fix2