Credit @gfabiano for #13382, #13385, #13415