Merge tag '0.3.5' into cdb

Release 0.3.5 fixed
Merge tag '0.3.5'

Release 0.3.5
Stubs next version