merge with quarx

Change-Id: Id81312e4dae7143df31ce2e8914281387858c74c