Merge "Prevented json array of numbers appending on merge" into devel/master