#93796 dependencies improvements