Merge "Beta fixes - alignment." into main