Feature #1334, Bug #1337, Feature #1338,