Merge "Make receiver as system user only" into main