Jdf 691

JDF-691 + one fix to pass bom-check validation