Merge "FP2-1408: Need show SW version at user build" into fp2-dev-v2