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