make work with v3.16 tag on mainline