Merge branch 'boottrace-update' into boottrace/core