Test commit.

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