Finish merging @benoitbryon's #1946 with develop