BZ-13368 Added additional expression