Integrated changes due to review bei ankgup87