Merge "configstore@1.2: remove requirement"