Bug Correction: Better handling of Q1500
Merge remote-tracking branch 'origin/master'