Merge branch 'develop'
Merge branch 'develop'
Resolved minor compile error
Merge branch 'master' into develop
Fixed RichBundle getOption return type