Stable update and fix #6829 -- Never learn by your mistakes, if you do you may never dare to try again.