Changes from master. Added comment after fork