Includes as part of issue #316 

NTC