This relates to #275 - part specific to R14.1.x branch. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>