Compatibility with wofh_ui
Merge remote-tracking branch 'origin/develop'