Merge "Added backwards compatibility support for data reg"