Fix workspace merge support
Fix test_install_store_offering