fixing merge issues with 0.91-dev