Merging upstream updates form EOX-A Master