Dev

Taking needed upstream changes