Issue #18833: Fixes for placeholder issues