Closes issues #1378 #1384 #1383