8 Commits (fix_244)