12 Commits (fix/src-filter)