Fix merge issues from earlier commit
Merge pull request #374 from vedujoshi/R1.06

Fix merge issues from earlier commit