Merge branch 'fix-test_nextpow2' into development