Bchin/merging sprint 38 release branch