Merge "Add support for OS Plugin v2.35"