noqsi Merge branch 'issue_fix'