PR: 26939 Submitted by: Konstantinos Konstantinidis <kkonstan@duth.gr>
OSD. PR: 26276 Submitted by: Konstantinos Konstantinidis <kkonstan@daemon.gr>