xapi-project:master catching up with upstream djs55:master