Change value taking delay into account
Merge branch 'release/v2.1.31'