Merge from SerbianVariants branch, trunk 16500 vs SerbianVariants 16523