Merge "Corrected hibernate for cfvc customization table"