Merge branch 'fp2-release' into fp2-dev-v2

* fp2-release:
  FP2-1215: Build fingerprint standards are not followed