DDBEXTRA-183: main header changes
Merge remote-tracking branch 'origin/DDBEXTRA-183' into develop