Merge "Revert^3 "Drop VDM permissions from Shell"" into main