Merge "[rdkb][common][app][Refactor ksmbd]"