core-5044 core-5045 fix save issues