January 15 Merge from M to J