Nonblocking merged from updated master