Status: GREEN

1. Merged QA changes