Setup specific versions for generic-user-popup branch