add option propagation
Merge remote-tracking branch 'origin/v3-dev' into v3-dev

Conflicts:
	module/Rubedo/src/Rubedo/Frontoffice/views/scripts/index/index.phtml
Merge remote-tracking branch 'origin/v3-dev' into v3-dev

Conflicts:
	module/Rubedo/src/Rubedo/Frontoffice/views/scripts/index/index.phtml