Backport updates #2
Description
Some features were implemeneted for 1.16 but only released for 1.18 and up, making them trivial to release on 1.16.
The features added after the 1.18 port (at least up to 1.19-1.2) should be easy to backport as well.
{{ message }}