Issues #563 , #571 , #592