[#1] Initial commit for feature branch related with [E-99].