Merge "Fixes for pin-restricted settings." into klp-dev