Add empty command support for hot-fix