Merge "Fixes in ManageTitanSchema"