Revert "Revert "BOA-2.2.0""

This reverts commit 6ded67d07c6b361449c3f3e5a13067176d5f2f46.