Merge branch 'dev' into gemtalk
(cherry picked from commit 1bb9700cf28300a80a4a1b0e01770fb360d50cc0)
Merge branch 'master' into gemtalk