(cherry picked from commit f1bad342)
Co-authored-by: nevadita.chatterjee nevadita.chatterjee@iopsys.eu