Custom builds: Adding build for issue #7533