Bulk PR for the final version :)

Important is ARQ-1473