[FIXED-#548] ...

lets see if the build go through...

[more commits pending, don't pull yet]