Merge remote branch 'upstream/general-devel' into general-devel
Remove WorldID from the WHERE clause in UPDATE SQL for RememberedPosManager, changed logic to also update the WorldID