Manual Merge of #336