Closes features #1655, #1654, #1653