Merge branch 'release/1.2.1' into develop
Modify watchdog-related functions
Improve output object-container's settings
Merge branch 'release/1.2.1'