Merge branch 'fix-issue-369' into 'master'