Rendering for AND Cell
Reverted intrusive and messy propogator change in favour of a simpler fix.
Merge remote-tracking branch 'upstream/master'