Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev