@robsquires, this seems the last fix to be done and this PR can be merged.