Merge "Update guts to match latest specs" into qt-dev