Merge changes from topic "tools-patch1"