Merge branch 'master' into v1
model_name setter
Merge branch 'v1'