[GOPJ-581] GOPJ-581