Merge "Show two step credential only for custom bp." into main