See commit descriptions for details.
requested review from @bgarrido
approved this merge request
merged