Merge stable branch (part 1)