Refs #3809 - Remove useless assignments
Merge remote branch 'origin/develop' into develop