commit bugs fixes for 1.2.1.0 build