merge of gh-repo online changes