More enhancements for VAMerge (2.1.12.289)