This should close bug 2645. Some cosmetics here and there. Adapted for r14.0.x branch. Signed-off-by: gregory guy <gregory-tde@laposte.net> Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit db81506ab3)
db81506ab3