All basic functionalities working.
Merge remote-tracking branch 'origin/trunk'