Yesterday
merge from catapult_adminreload_fix