This partially resolves Bug 2576 Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit c10124c965)
c10124c965