Merge giraffe-develop branch with the official develop

[pbastia]

Describe the task

We're doing away with separate development flows! Collaboration here we are :)

Acceptance Criteria

• [x] Open a PR
• [x] Moose team reviews the PR
• [x] Area of interest are well explained
• [x] giraffe-develop is no more and we all work off of develop!

Additional context

• Add any other context about the task here.
• Or here

[pbastia]

@patriciarussellCAS 👀