[VOLO-37] Merge Milestone 5 and 6 together