Merge branch 'scaffold-update' into 'develop'

Change 'ScaffoldClient.collect_aux_var' behavior on unused module.

See merge request !31