Feature/maintance 3.x/issue2025

#2025