updated status from gmb commit c2525e3