Merge branch 'pr/381'