Add these changes from WIP force merge of it.