Merge hardware and software rest calls
1 file changed