Merge branch 'master' into feature/UIMA-5823-Add-basic-benchmarking-module