Merge "Fixes regarding to comments in ag/2839267"