merge branch editors-sebastian

- with latest modifications