(cherry picked from commit 30c9faff) (cherry picked from commit 95c3ad53) This fixes a regression which was introduced into v248-stable with 976b4254.