[3.8] Fix #1573 : Propose rights reset prior apply template