Omitted from the merge because of code formatting changes

2 jobs for master in 12 minutes and 39 seconds (queued for 7 minutes and 37 seconds)