Fixed NEXIOS-565. Did work on NEXIOS-569, NEXIOS-568, NEXIOS-567, NEXIOS-566.