merge from @Vertigo17