Today
merge from skinviewer_connect_fix