preparing for 3.9.1 + adding button disabled state