v1.2.1 Full Port to 1.7.10