Dev#17871 oaista la vista

Laurent requested to merge dev#17871_oaista_la_vista into WIP

Merge request reports