Please review !14

Please review !14 (merged)

• Merge dev into f-...
• Check for pipeline compatibility
• Reviewed new integration test and either merged or gave back to @salexan