Merge "Relax user constraint on storage state." into klp-dev