Update multidev with SPMD2 changes