LPS-43988 Replace groupId as well
LPS-43988 Do not allow layoutId replacemant to affect on the groupId
LPS-43988 We shouldn't depend on the layoutId
LPS-43988 SF