Merge branch 'its9894' into 'master'

ITS#9894 don't use gmake-specific features

See merge request !553
4 jobs for !553 with its9894 into master in 40 minutes and 31 seconds (queued for 1 second)