Merge pull request #4620 from nabinhait/fixes12

Minor fixes