[US4394] Initial commit