[BASE] Improvements (#1347)

6 files changed