Merge branch 'master' into next_version

mentioned in commit c88aa58d

mentioned in commit b2615442

mentioned in commit 116e0210

mentioned in commit 4e0e577c

mentioned in commit b58c3992

mentioned in commit 2f788ee2

mentioned in commit 8a1d5450

mentioned in commit 06b33c88

mentioned in commit c0b73f09

mentioned in commit 81d25f33

mentioned in commit 81d09906

mentioned in commit f13aa86b

mentioned in commit f13aa86b

mentioned in commit 354c2543