Merge typos and additional layers to stable