Merge "Moving shared classes to common.pip package 5/N" into main