PR: 128195, 128387 Submitted by: Christian Sturm <athaba@inode.at>, Vaclav Haisman <v.haisman@sh.cvut.cz>