Bug/qa review

@alexey-rise please review. 

@alanclayton FYI. 

Cheers!