AI-499 : first short for inline field edit