merge owsproxycontroller
merge
'use' changed