Apply eaa2b83 to master as well