9 Commits (qr-reader-rebased)