TRUNK-2999 Addressed more review comments