This is for the diversity paper dec version codes.
Merge remote-tracking branch 'origin/master'