INT-3150: More review comments addressed