Merge "Fixing NPE issue with GuidanceStylist." into nyc-dev