Merge af3#4271 first!
Issue-URL: af3#4256 (closed)
Issue-ref: 4256 Issue-URL: #4256 Signed-off-by: Tiziano Munaro <munaro@fortiss.org>