RIFTSAW-543 Align with community bom