Ported to 5.4
- (Do not merge to 5.3, instead create a new branch 5.4 when this MR gets accepted / also works in 5.3, maybe rename branch to "5.3/5.4"?)
- Fixed compile warnings (ANSI Strings will not be supported to identify JSON fields in future versions)