Merge "init: Remove /acct" into main