Refactoring
Fix syntax
Fix
fix
Update changelog and change version
Merge branch 'pixel-admin' into unittests