Merge "Update Runtime metadata property config" into main