Any chance to get this be merged?