Merge back from develop

The port work, it begins soon.