[fix] [minor] pull updates from 1310 branch