4 Commits (fix-3534)