dev merge in preparation for r5