Sprint7

Pull Sprint 7 work into master. 

@prabinv @tsanko @kevinsproles @texasag - just letting you know 💬