point_cloud: back ported changes to pc iteration

fixes #715 for me