docs update staged
merge master into video