d21f29
Resolves: #1348620, #1344480, #1346070 Sync with upstream master, commit a3b473373ee43a292f5ec68a7fda6b9cfb26a9b0