Update unported modules from current 7.0 branch