Merging master into cv-rework