Resolve #3464069 "Add better exposed"

Shivanrequested to merge
issue/chosen-3464069:3464069-add-better-exposed into 4.0.x

Closes #3464069

Merge request reports