sug-401 const removed
Merge branch '4.4' into 4.5