Created patch for 2.x branch from 3.x as it is already fixed there.
Please re...