#525 master additions