Merge "Adds stripTrailingFs"