Merge "Handle the case where there is no clip defined"