Fix. issue912
Merge branch 'issue912'
Add. Add flat. issue913
Merge branch 'issue913'