Closes #1510 & #1254