14 Commits (revert-3409-performance)