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