12 Commits (fix_247)