With XF 2.2 taking longer than expected, I am going to move some of the features I've implemented for AMS 2.2 into AMS 2.1.x (starting with AMS...