WPBQA-242 Added a few comments to the previous commit