Merge branch 'release/rx' into develop
refactoring
Merge branch 'release/on_error_resume_next'