Merge "Fix metadata access" into klp-dev