[PATCH] Update for/of service-disable-check-macro