Merge "Rectify Boottime property"