[Moose-dev] Merged cyrille changes