TOP4/5/6 hot fix + UT
Merge remote-tracking branch 'origin/master'