Merge branch '1912'

1 job for master in 17 minutes and 55 seconds