@polesye Done. https://github.com/edx/edx-platform/pull/2176/files#diff-da1b19cc5f03a6f278a0c5a14616f7a5R580 and https://github.com/edx/edx-platform/pull/2176/files#diff-50340266eadb0ddab2634b0c3e427f4aR184 .