Merge changes from topic "mp/giv3-discovery" into integration