Merge "Add grouping in BW Est and change the operation order before updateCapabilites()" into sc-dev