13 Commits (feat/dynamite/some_ofs_optimizations)