Merge changes from topic "xtesting"