devel-E branch reintegration, hud reintegrated