Committing changes from #673 to feature