Merge changes from topic 'yangman'