Unified Picasso M and MF support, part 3 (final)