Merge "BUG-4283 experimenter msg support - registration part"