solve 2440_Kagisys
Merge branch 'feature-2440_Kagisys'