Merge branch 'fix-v2' into 'v2-220318'

See merge request linkseeks-design/pro-platform!594

(cherry picked from commit 4707c627cf001807c90a07b128c94efe0866ff22)

fbe271de Merge branch 'fix-v2' into 'v2'