Merge "Docs: Complications additions and changes" into nyc-dev