head fixes
case fixes
merge dev