Merge "Add missing getter & improve docs"