Origin/kjellander

Update to SDK 20 + some unfinished XML stuff.