Prepare for GENIVI Baseline 6.0.0