Closes #1795, #1797, #1798 and #1799

Closes #1795, #1797, #1798 and #1799