Merged code from last release