VE-654: move changes from core to our files.