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