Merge from HD project in progress

Signed-off-by: Youngki Ahn <avej.com@gmail.com>