I solved this issue accidentally in feature 8 branch, here is the commit:
https://github.com/savayg/buzzstarter-training/commit/7aca3a788ca2deb75d423802e592de7c1ffdf0b7