SOC-4034 | updated following th remarks and add more comments