Merge stable branch (part 2)