Merge "Update QXDM configuration files"