Imported Upstream version 0.54.1