Merge branch 'optimize-command_available' into 'develop'