* supersedes/fixes #32518 * only for 2.4.x - we'll make the necessary code changes for 2.5 to work with the updated version