Forward port inline validation fix from 4.3rc2