Merge branch 'ltp/stable/upd919ed14' into stable