1802 | Subhas/Viky | Backport #1802 to release 1.0.0