* commit '1ecce0e9bbc07cb3eb6f6bc1fca9d42c9e9c8176': Fix minor issues Update macro Java formatting of args