Merge "Further fixes on VIMS.onPreCreatedUserConversion()"