Pull context-bitmap into release branch
Tony Luck authored
7669a225