Draft: [No Commit] Issue #3439747: Adjustments to prepare for core inclusion

m4oliveirequested to merge
issue/navigation-3439747:3439747-core-inclusion-adjustments into 1.x

Closes #3439747

Merge request reports