Merge tomcat support to main stream

Merge tomcat support to main stream