Update for Bamboo 5.4.1, minor restructuring