6 Commits (fix-1647)