Code improvements related core 1485
Merge pull request #546 from vksvenkat/master

Code improvements related core 1485