Fixed active bit.
Merge branch 'test' into dev