testing #669 and #646 for release