[#862832] Review fixes for commit related to 862832 only.