Moved function call to inside conditional statement and fixed some tabbing.
Merge branch 'refs/heads/hotfix-gc' into 3.3/develop