Merge "BUG-731: last warnings fixed"