Reviewed-by: prr, amenkov
The specification change was reviewed by Florian Bomers also Reviewed-by: amenkov