Merge branch 'master' into dev
Yes, 1st edition.
yes, release
Merge branch 'dev'