Merge tag '1.0.4' into develop

1.0.4
Search Aeria Reorder

Signed-off-by: Graziano Vincini <graziano.vincini@caffeinalab.com>
Merge branch 'release/1.0.5'