Develop changes into v6#1681

jmgasper merged 2 commits intov6topcoder-platform/work-manager:v6from

developtopcoder-platform/work-manager:developCopy head branch name to clipboard