Further changes to be able to use own login view scripts etc.
Merge remote-tracking branch 'origin/development' into development