added feature discovery changes to master