Closes  #756 Closes  #757 .