Merge branch 'master' into next_app_vmap

mentioned in commit 8a1d5450

mentioned in commit c465203a

mentioned in commit acd3d63b

mentioned in commit 63499f55

mentioned in commit 9795f569

mentioned in commit 81d25f33

mentioned in commit 77e2b19f

mentioned in commit 77e2b19f

mentioned in commit b241e8f2

mentioned in commit b241e8f2

mentioned in commit 3885f268

mentioned in commit 3885f268

mentioned in commit 9980c4bf

mentioned in commit b5654d02

mentioned in commit fd799438

mentioned in commit fd799438

mentioned in commit e2b03a05