[ task #731 ] Uniformize ref generation. Propals
Merge pull request #708 from simnandez/develop

[ task #731 ] Uniformize ref generation. Propals