Added some files skipped by the previous merge's resolution.

Signed-off-by: Panajev <Panajev@gmail.com>