Today
merge from demoshot_ui_fix