Getting some of the features added after v2.1.0 v2.2.0's release out given that it could be a while before the rewrite is complete.