If you buy blu-ray only you are going to receive the 2011 masters.
Is this confirmed? I’ve just read a post on the blu-ray.com forum saying the standalone BD of Episode IV is the new master.
https://forum.blu-ray.com/showpost.php?p=18005214&postcount=4063
And these screen caps suggest otherwise:
https://caps-a-holic.com/c.php?a=1&x=249&y=121&d1=14082&d2=13933&s1=143207&s2=141385&l=0&i=4&go=1