Suppress compiler warnings
Merge branch 'development' into clock
Suppress compiler warning