Note: issues before #336 can be accessed here