Ubuntu 3.2 wip

All needed changes in one commit