nicki: merge 15.4.A.1.9 source