HomeIn-Portal Phabricator

Merge of "in-portal/releases/5.2.1@16068" to "in-portal/branches/5.3.x@16094".

Description

Merge of "in-portal/releases/5.2.1@16068" to "in-portal/branches/5.3.x@16094".

  1. restored changes, that were lost during inaccurate merge conflict resolution