Merge branch 'pr/380'