change firmware after merging into dev
Merge branch 'firmware' into dev