[GOPJ-583] GOPJ-583