Merge "Fix clipTopAmount when read in 2 more critical places" into tm-dev