Fix yellow to green
Merge branch 'hotfix/green' into development