Merge "Fixed trjconv -sub" into release-4-5-patches