2.1.22 beta

#745 - #744 - #684