@wpoely86: can you make the above line exactly the same as here (trailing `,`, indent), to avoid conflicts when this PR or #379 are merged...