Any modifications before merging downstream.
Merge remote-tracking branch 'upstream/develop' into develop
changed some variable names