CFY-1231 unrelated dev command bug fix