Merge edits from DexterInd