Backport remember checked

Manual backport of #4175 because git wasn’t able to do an automatic one. Please review, @VicDeo @Kondou-ger :)