All NIT and minor issues fixed in -12 version.