merge changes made by Ignite team