Merge "Force EST loopback for hidden menu testing" into main