further context help improvements
merge upstream develop