Do not remove quotes - OSJC-124 is fixed.