Today
merge from catapult_load_fix