; (4) in subsection (d)— (A) in the matter preceding paragraph (1), by striking 727, 1141, 1192, 1228, or 1328 and inserting 1031, 1141, 1192, or 1228 ; and (B) beginning in the matter preceding paragraph (1), by striking If a discharge has been granted and all that follows through the end of paragraph (2); (5) in subsection (f), by striking (c) or ; and (6) by striking subsections (k), (l), and (m) and inserting the following: (k) (1) Nothing in this section prejudices the ability to bring a motion for contempt of court for a violation of subsection (a) or any cause of action under applicable nonbankruptcy law. (2) Any pre-dispute arbitration agreement or pre-dispute joint-action waiver purporting to apply to such an action is void. (l) Upon an entity’s request, and after notice and a hearing, the court shall issue an order declaring whether an action proposed to be taken by the entity would be a violation of the discharge injunction under subsection (a). (m) The debtor’s failure to assert, raise, or plead the discharge shall not be construed to be a waiver against asserting the discharge. . (ii) Protection against discriminatory treatment Section 525 of title 11, United States Code, is amended— (1) in subsection (a), by striking solely ; (2) in subsection (b), in the matter preceding paragraph (1)— (A) by inserting deny employment to, following may ; and (B) by striking solely ; and (3) by adding at the end the following: (d) (1) A person aggrieved by a violation of this section may enforce this section in the bankruptcy case or by bringing a civil action in an appropriate district court of the United States. (2) To remedy a violation of this section, a court may— (A) award damages including back pay; (B) grant injunctive or other equitable relief