SF Feature requests #168 and #163 - part 3