Merge branch 'pr-559'