[ clocc-Bugs-564727 ] Bugfixes and some other things to PORT


Thread view