Merge "Simply ignore invalid keys" into sc-qpr1-dev