code merge
DSC-78 label changed to 'Timed/Non-Timed' after save.
DSC-319 Label changed to 'Timed/Non-Timed'.
Merge pull request #537 from nla/bs-dsc-333-constraint

Bs dsc 333 constraint
Merge remote-tracking branch 'origin/master' into dsc-434