GQSS-339 Preserve domain Id for later usage.