including fixes for merge