Apply fix merged into devel