Issue is fixed, branch ready to merge into master