GCP-7810 handled different saving scenarios plus updating of seed source