Merge branch 'issue-522'