10 Commits (fix_244)