SEP-1, changed string values
Merge branch 'discardTrack' into dev