Fixed implements' error handling
auto-merge staging into master