Merged in 1149 (pull request #620)
This is a solution for issue #1149 and initial support for issue #868.
Â
This is a solution for issue #1149 and initial support for issue #868.
Â