JBIDE-14495 - as/server