updated status from gmb commit dbed804