8 Commits (fix-1523)