Issue/1911

Closes #1911 
Closes #1914