Add some notes and fix on comments
Import change at #923 to release branch