Merge branch 'next_version' into next_app_vmap

mentioned in commit b58c3992

mentioned in commit 2f788ee2

mentioned in commit 8a1d5450

mentioned in commit 06b33c88

mentioned in commit 81d25f33

mentioned in commit 81d09906

mentioned in commit 81d09906

mentioned in commit b241e8f2

mentioned in commit b241e8f2

mentioned in commit f13aa86b

mentioned in commit f13aa86b

mentioned in commit 354c2543

mentioned in commit b5654d02

mentioned in commit b5654d02

mentioned in commit fd799438

mentioned in commit fd799438

mentioned in commit e2b03a05