[FEATURE] merged latest develop into stream branch