FS-4768 add missing solution changes