merge Quarx2k

Change-Id: I29591333f07e66227fdce980afc1d5fa855ae0bc