Moved work for isue 532 into it's own branch.