Added fast check on the command trigger
Merge branch 'develop' into local-fix