Test commit.

Bazooyan

Updates issue:384, issue:399, and issue:400.