Align with PR #1493