Merge "Revert shadow defaults to previous values" into lmp-dev