Merge branch '1930-shader-bug-rel' into 'release-7.0'

Ice OpenGL refactoring (release)

See merge request !612
22 jobs for release-7.0 in 97 minutes and 6 seconds (queued for 9 seconds)