Also optimize/fix on code injection
Changelog