Fixing condition for descriptorSharedParams
Syncing with master