This is taken from commit #dd7cf94ecdb1c1368fed2458c4f45bd95e1a140c from ODU container repo. No changes were made at all.