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

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

(cherry picked from commit aabc15d8f6334de0907dc8500dfbc0f14a183dfa)

1fcb0ea9 Merge branch 'fix-v2' into 'v2'