January 2018 Merge