2.06.3:zeress:126 More work for #197