[Finishes #83963984] Added some logging and replaced a hard coded value with constant