* commit '4a683a343083ec2b8aed1ee63669dbade6c0379f': Fix issue #6584942 IllegalStateException: Failure saving state...