LPS-28896: Resolve the inconsistency at creation of suborganization