Several conflicts have been resolved thanks to the help from @khoo @tstreble and @jdevivi
This sweep contains the following MRs: