Merge proposals dependent on lp://qastaging/~gero-bare/scratch/scratch-check-for-binary-files

1. scratch-check-for-binary-files
2. Dependent merge proposals