Update Frodo branch with current master branch bug fixes, improvemnets and resolved issues.