Please review branch feature/optimizations