Merge branch 'pr/392'