WIP: Cherry-picking satellite to get only commits related to AlignmentOnline and not to other projects

attempting to cherry-pick satellite branch... not sure if I can do it here though, if not I will close the MR