Update keywords and prepare v2.1.10 release

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' into 2.2
Prepare v2.2.3 release

Signed-off-by: crynobone <crynobone@gmail.com>