WIP: Cr xq

Closed Mathias Goebel requested to merge cr-xq into master