Merge luametrics modifications from BP's