Work in progress for VB-1865 and other performance enhancements.