Today
merge from optimize_outline_manager