[zboy/f29] Updated to new upstream release