Adapt to modified name parser class and reduce logging
Avoid reference sync NPE
Merge branch 'master' into jetty