V2.2.5

apply enhaned patch