Respect delay
Merge branch 'respect-deley' into develop