Revert "Revert "Merge branch 'issue1'""

This reverts commit 82c0df8f44d7e21dc4f003f2610c0d00e5c320c5.