Merge pull request #6044 from hentailord85ez/discard-penultimate-sigma

Allow always discarding of penultimate sigma and fix doing 1 less step than specified