Context change

This consists of the first two commits from #1269, rebased and slightly modified.
sounds good. Added a warning to use _object throughout setter to avoid bugs.