GitHub ref.: 54/merge