Code alignment (#5507) - Basecamp