Merge "Few documentation/type hint updates"