Merge branch 'issue/904'