REPORT-468: Reverted adding static to the inner class