UI: context placeholder
login redirect
Merge branch 'dev' into dev-test
Merge remote-tracking branch 'origin/dev-test' into dev-test