Bug 495785 and Bug 495788 fixed

Merged Jeno Attila Balasko requested to merge github/fork/balaskoa/master into master

Merge request reports