Merge branch 'dev' into gemtalk

(cherry picked from commit 26725b6a80b5950f8bc02bb97f94969c40f9769f)