Link default to body control value
(cherry picked from commit ab7cedee4cbcfc780bc8190cd2c4ad99986179e5)
Ditto for ifelapsed - link to agent control
(cherry picked from commit c821ad5532c6069ec9086546f20365a24b77f28a)