#1215 - qrcode fixes based on new PSD