Reverted moved so that merge with main branch can easier take place