BUGR-11249

Changes for https://apps.topcoder.com/bugs/browse/BUGR-11249