Merge "Fixing cosmetic kinks"