Merge "Support adding suffixes to module names and deps." into main