restored overwritten changes from #51
Merge pull request #128 from tpolecat/flori-fix

OCSADV-154 restored overwritten changes from #51(REL-2015)