Merged all main trunk bugfixes up to release 2.0.5