US536 - Improve code after code review
Merge branch 'development' into development-work
US536 - remove warnings from compilation