checkin to sync with n580-linux
commit prior to pull