sync with nsr v0.4.1