Closes #1268, #1230 & #1281