Merge: rev775 (required tos accept checkbox)