Today
merge from december24_art_fixes