Merge branch 'autopar_rebase2' into autopar_devel

Quickly commit changes in the rebase branch.