Merge commit '4babd458daa3fd7ff73110b1689094a9586a3c46' * commit '4babd458daa3fd7ff73110b1689094a9586a3c46': Address romain's code review comments
Merge commit '4babd458daa3fd7ff73110b1689094a9586a3c46' * commit '4babd458daa3fd7ff73110b1689094a9586a3c46': Address romain's code review comments