-By Benjamin. Some stuff for bug UATNBFMH012 and UATNBFMH019.