Merge "Add a missing fragment to list of valid ones for top-level settings" into klp-dev