matched changes in in-development version of helper support API