Merged barry-b1-socket-arch-branch into MAIN.