PR #2950 extension
Metadata Update from @tkopecek: - Pull-request tagged with: testing-ready
rebased onto 4154870a9f785a74bd7287f74142dec7517c00be
rebased onto f21f07acd67d9bf579555fd0b362fce298d41f95
Metadata Update from @mfilip: - Pull-request tagged with: testing-done
Commit 2618c50c fixes this pull-request
Pull-Request has been merged by tkopecek
PR #2950 extension