Failing test for #527
Fixes #527
Merge branch 'model-refresh-bug' into dev