Merge "DB resolutions are picking inputKeyMapping values from DD"