Added to Merged scene a fixed version from latest updates
Merge branch 'develop' of https://github.com/jiangkuo888/ORP_beta into develop