firmware commit
after merge