'Merge' azrael code from the azrael branch