Merged changes form nx/common