frontend: merge updates from SDL project