Merge "Remove references to the pdk product variable" into main