Merge branch 'IZPACK-1113' into personal
BAD MERGE: Ensure to save data on panel switch.
Merge branch 'IZPACK-1090' into personal