Update from latest delivery.

Signed-off-by: Marek Puzyniak <marek.puzyniak@iopsys.eu>