Merge "aslgen od to hr initial implementation" into main