Get rid of /hide call.
Merge branch 'test' into dev