Merge to stable 1.01