client bugs fixed
before master merge
after master merge
coreclass