Should have been on stable branch!