Merge "Extracts image acquisition to a separate class" into tm-qpr-dev