Fixes for 1.5.6-r2 release

This PR contains the fixes to the bugs found after release 1.5.6. /cc @cmaglie 
Issues: #1885