merge + COR-27 bug fix.
Architecture graphics update.