Retry to merge S-194724 - check is registered

@indytechcook, sorry i created new branch for this,