Reintegrate after manual merge from empirephoenix