[devedeng/f25] Updated to new upstream release