Merge pull request #1835 from shackbarth/23257-qr-final