4 Commits (fix-1656-patch1)