Merge branch 'reorg-for-gui-layout-260315a' into 'main'

Add missing keys and move some for GUI workflow

See merge request !199