Merged performance improvements and examples