Golden with facets and merges with latest ayende/master