Build #618:   Merge branch 'sk_bp_9926' into dev on branch dev over 6 years ago