TODO: override should not bypass status check, this create should fail.
Merge branch 'master' into nrtm-comparison