Apollo-3024 Doc blocks