Add failing bug spec
Fix model logic
Merge branch 'bug-status-changes-with-old-ts' into develop