This merge includes several issue fixes and enhancements.

This merge includes several issue fixes and enhancements.