achamely Merge pull request #1793 from OmniLayer/staging