Merge "Multiple self-serve fixes"