KFSPTS-3490 : merge to develop - fixed invalid state with empty state