Resolve #3499285 "Refactor to decorate"

nicxvanrequested to merge
issue/migrate_boost-3499285:3499285-refactor-to-decorate into 2.0.x

Closes #3499285

Merge request reports