MNG-6558 and MNG-6573

[Sylwester Lachiewicz]

Folks,

I'd like to merge MNG-6558 and MNG-6573 into master.  Who seconds?

Sylwester

https://issues.apache.org/jira/browse/MNG-6558
https://issues.apache.org/jira/browse/MNG-6573