WIP
Needs change in packages.
rebased onto c05a41948e84067e90cf8e8956565cd2c1bbd716
rebased onto 8eb3d78425077cbbe5285235692312ee6196ff3f
rebased onto 43d7456bafd6f950a83f873c0b1ecf99786dc7d2
rebased onto b9f763bafd6653f490289b4dac594b4025650762
Pull-Request has been closed by ngompa
WIP
Needs change in packages.