FORGE-1407: Fixed navigation condition
FORGE-1379: Added scaffold-faces to core