committing change for BPS490
adding debug logs for BPS-504.