Merge Html and less fixes #2260