#18937 done. Fixed empty settings bug