Thread:924Q updates (2)

WIP, the draft is beign circulated amongst the teaM members