APSTUD-7575: incorporated Nam's review feedback.