Issue 6575 es props not getting picked up