Merge "fix failing mrpubsub job"