Merge branch 'stop-screwing-with-my-ide-12.1.x' into 'devel_12.1.x'

Stop screwing with my ide 12.1.x

See merge request !634