Pull request for devel branch + issue/365