Merge "Fix NPE in isTrimmable" into rvc-dev