This patch contains following changesi from main:
Signed-off-by: Filip Matusiak filip.matusiak@iopsys.eu