Propagate !700 from 2017-patches to master
Specific branch used to resolve some conflicts. Nothing serious, just a few print statements for some reason that could not be updated..
Specific branch used to resolve some conflicts. Nothing serious, just a few print statements for some reason that could not be updated..