Merge "Refactor how legacy dataspaces are decoded"