Adding onde attribute back
Merge branch 'refs/heads/add-reboot-timeout-attribute' into reboot-fixes