8 Commits (fix_246)