Merge branch 'dev' into 'main'

Revert "Check third module and second custom dashboard existed"

See merge request !8