Changes based on review on commit 90f7c2f84da790b90b1fc7eb63ef50dac1fd4049