#8401: merge with 3.3.