Merge branch 'SalamandraDevs:main' into logo-sticky