GORA-399

Signed-off-by: Renato Marroquin <rmarroquin@apache.org>
merge master into GORA-267