Merge of "in-portal/releases/5.2.1-B1@15627" to "in-portal/branches/5.3.x@15659". 1. restored changes, that were lost during inaccurate merge conflict resolution 2. other changes were already restored in: 15680, 15902, 16323
Merge of "in-portal/releases/5.2.1-B2@15839" to "in-portal/branches/5.3.x@15852". Merge of "in-portal/releases/5.2.1-RC1@15881" to "in-portal/branches/5.3.x@15852".