Merge branch 'develop' into command-available-check