This matches the behavior from 0.13.6 Fixes #8176 (cherry picked from commit 1e65313fa7bf8b64b5447b1a50e828903bde8413)