Made multi choice work with embed
Merge branch 'master' into api-1.1