merging schema changes with VBAT-53 changes