Pull in crcn/nexe master changes