This commit closes 1755 , closes 1754