BAP-172 - Support Bamboo 5.1