bunch of fixes
Test hot fix
Merge branch '3.9' into 3.9_custom_layout_editor