Merge pull request #880 from bugzmanov/master

[RJA-1902][feature] error handling
Merge pull request #881 from bugzmanov/master

[RJA-185] timestamp field
[RJA-xxx][fix] fixing tests