Merge branch 'hotfix/cfq'
sponsor - github
Merge branch 'hotfix/sp-github' into develop