Changed to `moment().add(value, unit)` notation
Merge remote-tracking branch 'origin/develop' into develop