Favor on finallyDo over EndObserver
Update dependencies