Changes to handle merged enhancements
1 file changed