OZP-664: Streamlined Kernel : MERGED WITH MASTER Sprint 6 : Updating parent commits