manual merge of CSP1150 array branch