latest merged changes from the sub-repos