Merge "Fix the exception of accessing an ArrayMap" into rvc-dev