Merge "Enhance pin/puk support" into klp-dev