sug-344 smaller hint
Merge branch '4.8'