Card #271 more secure user switching
Merge remote-tracking branch 'origin/develop' into develop