Merge remote-tracking branch 'laura/JAMES-1809'