Merge "Fix yet another clipTopAmount usage" into tm-dev