Merge remote-tracking branch 'btellier/JAMES-1830'