last round of changes for stable release