Merge pull request #2639 from vladimirfomene/fix-final-incorrect-cltv