Merged bugfixes upto [0000072] (version 2.0.3).