Do not make assumption on blueprints, remove some 'async: false', clean code
Hygiene -- remove 'return @'
Merge branch 'michel_2051_cleaning' into next