CSP1150 A1: greyscale WORKSgit status
Merge branch 'greyscale'