Aqua 13 07 acu97409 with keyspace support

Please review