Why is this block is not part of separate PR. This is OS independent.