Merge back changes from stable-1.6

[igchor]

This change is 

[szyrom]

Reviewable status: 0 of 3 files reviewed, all discussions resolved

[pmem-bot]

@janekmi and @Greg091 please review this pull request

[codecov]

Codecov Report

Merging #272 into master will not change coverage.
The diff coverage is n/a.

@@          Coverage Diff           @@
##           master    #272   +/-   ##
======================================
  Coverage    96.5%   96.5%           
======================================
  Files          30      30           
  Lines        2091    2091           
======================================
  Hits         2018    2018           
  Misses         73      73

Flag	Coverage Δ
#tests_clang_debug_cpp17	96.93% <ø> (ø)	⬆️
#tests_gcc_debug	97.88% <ø> (ø)	⬆️
#tests_gcc_release_cpp17_no_valgrind	96.63% <ø> (ø)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f93a0d7...4523aa7. Read the comment docs.