Bug789 v1.1 part1

Update version: rebased on latest master and with an incremental patch fixing the prefix.