Merge "Fix svace issue - uninitialized class member" into devel/master