Removed unnecessary merges from master

10 jobs for !120 with marijadukic/cherry-pick-97fc9e14 in 16 minutes and 54 seconds (queued for 3 seconds)
latest merge request