Add support for rv1 OR rv2 build 16+