BO-02 1st commit for 02

Signed-off-by: will <will@boinc.com>
BO-02 2nd commit for 02

Signed-off-by: will <will@boinc.com>