SLX-236 | fix 259
 SLX-236 | fix 289
 changelog 51 - bugs fixes