Merge "Fix issue #6584942 IllegalStateException: Failure saving state..." into jb-dev