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