AQ fixes gray line and 96% style
QA end
Merge branch 'hotfix/QA-v1'