Current versions, copied from master