Merge develop to master to get fix for language select bug (and other settings that could be forgotten) + code for setting any api node

Dan Notesteinrequested to merge
develop into master

Merge request reports