Merge "Adding support for NVM Express partitions"