Added reference to loc_id to remove unused variable warning
Merge remote-tracking branch 'upstream/develop' into develop