Migration of all activity descriptors into lists with KEYs: end of BAD conversions to keys
Merge remote-tracking branch 'origin/master'