fix --final-to-apply
Merge remote-tracking branch 'fil/master'