Topic/reqs-772

@jonathansenior , please review