merge with rawhide/f21 branch