Merge "Data compilation fix:"