Merge branch 'elflink' into firmware