A few adjustments to align better with FMV's Business Information needs.
Authored by: emlarsson 2021-03-26
Parent: [r6530]
Child: [r6532]