Feature #3515: Code implementation done, test on Android fail