COMP: use GL mapper wrapper
Merge branch 'bug-18528-UseWrapperForContourModelMapper'