Merge "Fix wrong offset in environment array" into stable/brahmaputra