bjin uapi: upstream change
Latest commit e14c1df Mar 25, 2017