FEATURE: 424082
This fix the "conflict" between !141 (merged) and !180 (merged).
cc @dfaure @ahmadsamir