Changes from master. Added comment