Merge "Adds embedded data specifications"