Merge "Handle agent_boot_time option"