closes #1240
Test Plan:
The changes were merged into release/3.16.0 with c3056ecd
The source branch has been deleted
approved this merge request
merged
mentioned in commit c3056ecd