merge in feldspar-le-release history after reset to feldspar-dev