sug-125 class for input removed on disposal
Merge branch '4.4'