Added missing code after tagging
merged with upstream