smallest advent (cherrypick)