some suggestions to sync with robot-suite-base
Fix merge conflict