Merge pull request #5059 from KanchanChauhan/PM-fixes-25Mar

Minor fixes