ref #4248, #4296 - fix travis CI build
ref #4248, #4296 - fix travis CI build
Merge remote-tracking branch 'origin/prd-4248/4296-systems-active/inactive' into prd-4248/4296-systems-active/inactive