Issue #3343868: Fix styling issues

Closes #3343868

Merge request reports