Revert "Revert "AV-45""

This reverts commit 013eb692818a34c6821f1c5d4bfa72782f4b9b24.
AV-45
Re-added missing public method.