Update from 1.2.2

Attempt to update local fork from MCONGROVE/ChariTi/1.2.2