Implementing condition polling only when opted in, #49