changes for merge compatiibility

Signed-off-by: krishnatejaperannagari <krishnatejaperannagari@gmail.com>