Ttnc not mandatory fix
Merge branch 'development' into qa